@pgert can you rebase the pr for me :)

You mean "squash" - No I can't.

Regarding the conflicts - What am I supposed to do?
Click on "Mark as resolved"?

You mean "squash" - No I can't.

Regarding the conflicts - What am I supposed to do? Click on "Mark as resolved"?

I hope this helps
First you need to resolve the conflicts (you can do it from your browser)

Then rebase the branch with Github Desktop

Finally you should be able to squash the commits.
(You don't need to do weird stuff like command line, so it should be easy.)

Does this do?
If not, I have to make a new PR.
GitHub Desktop is beyond me.